Allow button 2 to act as GDK_ACTION_ASK. Also, allow MOD1 to specify

1999-01-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
	as GDK_ACTION_ASK.  Also, allow MOD1 to specify GDK_ACTION_ASK
	only if that action is enabled in the actions argument.

diff --git a/ChangeLog b/ChangeLog
index 5b4e8cd022778ce4b57e6f8954e60c931de1b244..63d8f8766f04cc4c8c2d2d46978aeefb66dbb5b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1999-01-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
+       as GDK_ACTION_ASK.  Also, allow MOD1 to specify GDK_ACTION_ASK
+       only if that action is enabled in the actions argument.
+
 1999-01-20  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in (gtklocaledir): New variable.  Define to

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5b4e8cd022778ce4b57e6f8954e60c931de1b244..63d8f8766f04cc4c8c2d2d46978aeefb66dbb5b5 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+1999-01-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
+       as GDK_ACTION_ASK.  Also, allow MOD1 to specify GDK_ACTION_ASK
+       only if that action is enabled in the actions argument.
+
 1999-01-20  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in (gtklocaledir): New variable.  Define to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5b4e8cd022778ce4b57e6f8954e60c931de1b244..63d8f8766f04cc4c8c2d2d46978aeefb66dbb5b5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+1999-01-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
+       as GDK_ACTION_ASK.  Also, allow MOD1 to specify GDK_ACTION_ASK
+       only if that action is enabled in the actions argument.
+
 1999-01-20  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in (gtklocaledir): New variable.  Define to

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5b4e8cd022778ce4b57e6f8954e60c931de1b244..63d8f8766f04cc4c8c2d2d46978aeefb66dbb5b5 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+1999-01-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
+       as GDK_ACTION_ASK.  Also, allow MOD1 to specify GDK_ACTION_ASK
+       only if that action is enabled in the actions argument.
+
 1999-01-20  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in (gtklocaledir): New variable.  Define to

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5b4e8cd022778ce4b57e6f8954e60c931de1b244..63d8f8766f04cc4c8c2d2d46978aeefb66dbb5b5 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+1999-01-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
+       as GDK_ACTION_ASK.  Also, allow MOD1 to specify GDK_ACTION_ASK
+       only if that action is enabled in the actions argument.
+
 1999-01-20  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in (gtklocaledir): New variable.  Define to

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5b4e8cd022778ce4b57e6f8954e60c931de1b244..63d8f8766f04cc4c8c2d2d46978aeefb66dbb5b5 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+1999-01-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
+       as GDK_ACTION_ASK.  Also, allow MOD1 to specify GDK_ACTION_ASK
+       only if that action is enabled in the actions argument.
+
 1999-01-20  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in (gtklocaledir): New variable.  Define to

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5b4e8cd022778ce4b57e6f8954e60c931de1b244..63d8f8766f04cc4c8c2d2d46978aeefb66dbb5b5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+1999-01-20  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+       * gtk/gtkdnd.c (gtk_drag_get_event_action): Allow button 2 to act
+       as GDK_ACTION_ASK.  Also, allow MOD1 to specify GDK_ACTION_ASK
+       only if that action is enabled in the actions argument.
+
 1999-01-20  Raja R Harinath  <harinath@cs.umn.edu>
 
        * configure.in (gtklocaledir): New variable.  Define to

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 62af27d5d1ff3be1ff166737727902dcc09a3dfd..35d95411a537c89fa970093ff362445d35ab7b91 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -421,7 +421,7 @@ gtk_drag_get_event_action (GdkEvent *event, gint button, GdkDragAction actions)
        break;
       }
       
-      if (button == 3)
+      if (((button == 2) || (button == 3)) && (actions & GDK_ACTION_ASK))
        return GDK_ACTION_ASK;
       
       if (state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK))
@@ -435,7 +435,7 @@ gtk_drag_get_event_action (GdkEvent *event, gint button, GdkDragAction actions)
        }
       else
        {
-         if (state & (GDK_MOD1_MASK))
+         if ((state & (GDK_MOD1_MASK)) && (actions & GDK_ACTION_ASK))
            return GDK_ACTION_ASK;
 
          if (actions & GDK_ACTION_COPY)

diff --git a/gtk/gtktypebuiltins_evals.c b/gtk/gtktypebuiltins_evals.c
index 4dc9032e1f917ac4d8927f1e666e59421b813e38..37657240f459df54fa7d88397113ff95e6bfe314 100644 (file)
--- a/gtk/gtktypebuiltins_evals.c
+++ b/gtk/gtktypebuiltins_evals.c
@@ -1009,6 +1009,7 @@ static const GtkEnumValue _gdk_drag_protocol_values[] = {
   { GDK_DRAG_PROTO_MOTIF, "GDK_DRAG_PROTO_MOTIF", "motif" },
   { GDK_DRAG_PROTO_XDND, "GDK_DRAG_PROTO_XDND", "xdnd" },
   { GDK_DRAG_PROTO_ROOTWIN, "GDK_DRAG_PROTO_ROOTWIN", "rootwin" },
+  { GDK_DRAG_PROTO_NONE, "GDK_DRAG_PROTO_NONE", "none" },
   { 0, NULL, NULL }
 };
 static const GtkEnumValue _gdk_rgb_dither_values[] = {